'wgIllegalFileChars' => Title::convertByteClassToUnicodeClass( $illegalFileChars ),
'wgResourceLoaderStorageVersion' => $conf->get( 'ResourceLoaderStorageVersion' ),
'wgResourceLoaderStorageEnabled' => $conf->get( 'ResourceLoaderStorageEnabled' ),
- 'wgResourceLoaderLegacyModules' => self::getLegacyModules(),
'wgForeignUploadTargets' => $conf->get( 'ForeignUploadTargets' ),
'wgEnableUploads' => $conf->get( 'EnableUploads' ),
];
*/
public static function getStartupModulesUrl( ResourceLoaderContext $context ) {
$rl = $context->getResourceLoader();
-
$derivative = new DerivativeResourceLoaderContext( $context );
- $derivative->setModules( self::getStartupModules() );
+ $derivative->setModules( array_merge(
+ self::getStartupModules(),
+ self::getLegacyModules()
+ ) );
$derivative->setOnly( 'scripts' );
// Must setModules() before makeVersionQuery()
$derivative->setVersion( $rl->makeVersionQuery( $derivative ) );
'content' => [
'mediawiki.page.ready',
],
- // modules that exist for legacy reasons
- 'legacy' => ResourceLoaderStartUpModule::getLegacyModules(),
// modules relating to search functionality
'search' => [],
// modules relating to functionality relating to watching an article
registry[ module ].state = 'executing';
runScript = function () {
- var script, markModuleReady, nestedAddScript, legacyWait, implicitDependencies,
- // Expand to include dependencies since we have to exclude both legacy modules
- // and their dependencies from the legacyWait (to prevent a circular dependency).
- legacyModules = resolve( mw.config.get( 'wgResourceLoaderLegacyModules', [] ) );
+ var script, markModuleReady, nestedAddScript, implicitDependencies, implicitWait;
script = registry[ module ].script;
markModuleReady = function () {
} );
};
- implicitDependencies = ( $.inArray( module, legacyModules ) !== -1 ) ?
- [] :
- legacyModules;
+ implicitDependencies = [];
if ( module === 'user' ) {
// Implicit dependency on the site module. Not real dependency because
implicitDependencies.push( 'site' );
}
- legacyWait = implicitDependencies.length ?
+ implicitWait = implicitDependencies.length ?
mw.loader.using( implicitDependencies ) :
$.Deferred().resolve();
- legacyWait.always( function () {
+ implicitWait.always( function () {
try {
if ( Array.isArray( script ) ) {
nestedAddScript( script, markModuleReady, 0 );